am b602c328: Merge change I31c52bef into eclair

Merge commit 'b602c328c24f82d61038ac1222bd40a3cc7bc900' into eclair-plus-aosp

* commit 'b602c328c24f82d61038ac1222bd40a3cc7bc900':
  Revert change incorrectly submitted as part of change #32153.
tree: b7d6c0549d93616010a6a76ecdd98fcb27b5f473
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE