Merge "DO NOT MERGE Increase the system-image revision number after opengl bug fix" into mnc-dev