Merge commit '65ab88c78916d7e3a182125878b17c8f40d7cac5' into eclair-mr2-plus-aosp * commit '65ab88c78916d7e3a182125878b17c8f40d7cac5': fix [2231527] Compatibility with SpaceJunk game (OpenGL)
Merge commit '65ab88c78916d7e3a182125878b17c8f40d7cac5' into eclair-mr2-plus-aosp * commit '65ab88c78916d7e3a182125878b17c8f40d7cac5': fix [2231527] Compatibility with SpaceJunk game (OpenGL)