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