am 23aa34a7: Merge change I137dac6f into eclair

Merge commit '23aa34a743ae18e0d45b459f0c7010eb47a2147a' into eclair-plus-aosp

* commit '23aa34a743ae18e0d45b459f0c7010eb47a2147a':
  backout a workaround that is not needed anymore
tree: 9e84f6e528e03e588e38959ccb23df6f9faec8d1
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE