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