Merge change 24334 into eclair

* changes:
  fix [2037525] Fail to start camera after adb sync new Camera
tree: 084bbf3346ba524972a058796ec50c0d581e77e4
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE