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