Snap for 4657601 from 7259bc14bddf491a84748c7c91679bf902148155 to oc-m4-release

Change-Id: Ic6c102c5cb72e14b745f072acf51b2b5a242ba85
tree: 2c45ec94eb5dd267d9f307b8e17f28c5220243ab
  1. res/
  2. src/
  3. tests/
  4. tools/
  5. Android.mk
  6. AndroidManifest.xml
  7. CleanSpec.mk