Merge change 24473 into eclair

* changes:
  fix [2074427] SurfaceView doesn't disappear on GONE
tree: b81a3f55cd9c2f8efe4daf70ace9eb1b7d880595
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE