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

Change-Id: If546db92964adda9bc712139bb792f0ba3c1622f