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

* commit '0c0fd6480c7dfd40de6a0514abd634e481c35f90':
  emulator opengl - directory rearrangment