am 6a2aa7d7: Merge "Make sure RGB_565 config is available to emulator"

* commit '6a2aa7d7f37662c76296d8d53e6e57f0ad6417cf':
  Make sure RGB_565 config is available to emulator