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