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

Change-Id: Ie0a052923250a3a583bc41cb07a3dd7e37dcddea
tree: 6a369818059bf877f7cc3ca639b80c034b5a6f05
  1. host/
  2. .gitignore
  3. Android.bp