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