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

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