Merge "GLConsumer: add build-time disable of gpu protected content" into nyc-dev
am: 0b546c4086

* commit '0b546c408686e4353dfe4b3a12be1048b966944d':
  GLConsumer: add build-time disable of gpu protected content

Change-Id: I9775e2659cded403409367819f70a5833a8bf2c9