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

* commit 'fef11912975311ce706a25eb28f71ba78e4a8300':
  emulator opengl - directory rearrangment