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

Change-Id: Ifbe45c0894f64ad2a226e386136fb8f82787404c
tree: 866a2cb9523d8af9821af4e3fff805a440206fdd
  1. adt/
  2. notices/
  3. repository/
  4. tools/
  5. OWNERS
  6. update_jars.sh