Merge "Merge Android Pie into master"
am: a102b9de15

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