am 8743d100: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit '8743d1005f442d161d22feb0b495e67a2dc2f550':
  WAR for compiler crash on PhaseBeam.
tree: f0fe30e58399652523b050e047053d2bcf2ac9c1
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. default.properties
  6. proguard.cfg