Snap for 4399693 from fc4a80bdd3a9a29f52594ec48a1931b7670da60c to oc-mr1-release

Change-Id: If3e5c26f6b0c907655482d85e4c2d8518025ed50
tree: 69921b9546c0b0373afd09f9947d50a9e933e4cd
  1. Android.mk
  2. AndroidManifest.xml
  3. res/
  4. src/
  5. tests/