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

* commit 'af3a3778c2c17a8064da599bcabb7d141f59f9af':
  Switch libGLESv1_CM/libGLESv2 to hash-style=both