Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
am: 56f6d266be

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