Merge "Bug 4086255 drmserver process needs system group" into honeycomb-mr1