am 8ce14fd8: am 0c0fd648: am fef11912: am ba43b928: Merge "emulator opengl - directory rearrangment"

* commit '8ce14fd8b058d4815c89ae04f0476142a26ec540':
  emulator opengl - directory rearrangment