Merge "Bug 3012968 DRM output control" into honeycomb-mr1