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

Change-Id: I465be453d2062c2e8c74dd8a9f1d0098ccb8e4ee
tree: b9b5784e6cc182b14959cf8896ab79d4b675ef85
  1. src/
  2. Android.bp
  3. MODULE_LICENSE_APACHE2
  4. NOTICE
  5. README.version