Merge "Merge Android Pie into master" am: a102b9de15 am: 3bfae9cbaf
am: 0db51216cc

Change-Id: I1b1d933061c4bf9c82c13ea2c2cfae7947831650
tree: 27ef4a3c6afc7a1dbcfc3f071afa84573883ed43
  1. core/
  2. qr_scanner/
  3. Android.mk
  4. MODULE_LICENSE_APACHE2
  5. NOTICE
  6. README.version