Android 7.1.1 Release 55 (N6F27M)
Merge "Remove old opengl code and update references" into nyc-mr1-dev