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