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