Snap for 4657601 from cdb4db6fe66377acd01ede3c735bce55c6662553 to oc-m4-release

Change-Id: I4357f566a97fb351a9adff59e073932b65ed9f56
tree: c708efb6850f5d8115936406d5b743b225ae0944
  1. src/
  2. Android.mk
  3. AndroidManifest.xml
  4. proguard.flags