Merge change 1528 into donut

* changes:
  should help fix the Simulator build.
tree: f630dcbf9ead63e2b836e9cb3ffee2a0a4837390
  1. awt/
  2. camera/
  3. cmds/
  4. im/
  5. include/
  6. libs/
  7. opengl/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE