Merge "Bug 4159373 Use HDCP debug settings" into honeycomb-mr1