[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
am: 05d51ce80f -s ours
am skip reason: subject contains skip directive

Change-Id: I62926f0bae93f905132caacfe7b2c41054a443c8
tree: 39e98984145a753cdf6837647a0b034e6cd305e7
  1. MODULE_LICENSE_BSD
  2. NOTICE
  3. OWNERS
  4. XMPCore/
  5. build.gradle