Merge "Remove old opengl code and update references" into nyc-mr1-dev am: df5624ac36
am: 3941aa6201

Change-Id: I0d3db9e2d2c54be6767dec1c2f1555555e402b53