am 21f4ca57: am 74ed92d3: Merge "Move emugl system code to development.git"

* commit '21f4ca579e58e9a2eaad841f5174eba44c926153':
  Move emugl system code to development.git