Merge commit '9d1274a5b9eba0976d8bf19c94ff2d63718ccc44' into sc-platform-merge
Change-Id: I1dc94288a1528f5f3fd38eab9051d7f16ed27624
tree: d73e4b30b8a96cf3e2ffde008d258bdad8b76b4f
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. CleanSpec.mk
  6. OWNERS