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