Android CTS 7.1 Release 15 (4607299)
Merge "Remove old opengl code and update references" into nyc-mr1-dev