am b602c328: Merge change I31c52bef into eclair

Merge commit 'b602c328c24f82d61038ac1222bd40a3cc7bc900' into eclair-mr2

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