am 1193ae4e: Backport l53e91db7 from master.

Merge commit '1193ae4e824c66b75083c444ce0f250594e138ee' into eclair-plus-aosp

* commit '1193ae4e824c66b75083c444ce0f250594e138ee':
  Backport l53e91db7 from master.
tree: 02e006c44a49085c3359169c33b2dcaed4d96203
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE