Merge e768ce25c14944532f1225f369054ed422bdf117 on remote branch

Change-Id: I0ce01b166f42e38b2d44bb8851ffc118ca569c6b
tree: a0f0e9c58b06dab62302b664901e7929fb1c80cb
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS