[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE
am: 61eea37fdc  -s ours

Change-Id: I1bcdf6d9d3317f593202d3669c4c7f35641bfd5c
tree: c36a3fcf5520e484ac93dd012300c1ac1ed9ce05
  1. src/
  2. Android.bp
  3. MODULE_LICENSE_BSD_LIKE
  4. NOTICE
  5. README.version
  6. VERSION