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