am ba43b928: Merge "emulator opengl - directory rearrangment"

* commit 'ba43b928e6de8100c8feea75383dd89b1207c3c1':
  emulator opengl - directory rearrangment