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