Snap for 4384531 from df72aef0cf9dfc982caa09f3f701a740fdc289ae to oc-m2-release

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