Merge "emulator opengl - directory rearrangment"