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