am d6ad2a63: am 23a491dc: Merge "emulator opengl: renderControl API encoder/decoder"

* commit 'd6ad2a63ca51f11c97042baa43eb33904e6aefb4':
  emulator opengl: renderControl API encoder/decoder