Merge change I510ee049

* changes:
  Remove WAR for handling uploads when no surface was present.
tree: d5d27f7cda192af9aa04ec1b8e4578e15bfed61b
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. MODULE_LICENSE_APACHE2
  6. NOTICE