Merge "Switch libGLESv1_CM/libGLESv2 to hash-style=both" into mnc-dev