am f998c4a2: Merge change I1c0bebbc into eclair

Merge commit 'f998c4a289b3ed10bafcf581618d2cc8a8f69806' into eclair-plus-aosp

* commit 'f998c4a289b3ed10bafcf581618d2cc8a8f69806':
  fix [2262591] Junk on screen in ERD46
tree: df89b30b491832626dca45d536ad23bf40c43872
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE