Merge commit '97160a161f8eeb38018cd735a6adb64c4cebd375' from oc-dev into
stage-aosp-master

Test: only added new files
Bug: 67838832
Change-Id: I30f85e234f34b1dd5919c0bc81142e0ba590cdaa
tree: 6ffbce52e5193e51fae6990f16b9194d3f44f418
  1. android/
  2. com/
  3. Android.mk
  4. NOTICE.txt
  5. source.properties