Fix AndroidManifest.xml to be valid. am: 799c225b94
am: bd68f60fc7

Change-Id: Idc63f20f07b51f84dfa89e15d226a9c49a38af95
tree: e9e60ab0381130e7ae5ccb40201ba939b9b8224e
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags