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