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