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

Change-Id: Id9609e65f8be52c4c0485486d51c1fd6940803f3
tree: 8d430fe286e67dc62ca456d3cd3c18a854bc18ce
  1. src/
  2. Android.bp
  3. CleanSpec.mk