am 8ba16551: Merge "Fix build." into honeycomb-plus-aosp

* commit '8ba16551bc11379e7c1b1815612909e2515d0cb2':
  Fix build.
tree: 2f52f31c7cfbdf95eec5669ccdc6fecc74cf5607
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. MODULE_LICENSE_APACHE2
  7. NOTICE