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