[automerger skipped] DO NOT MERGE
am: 440e14d037  -s ours

Change-Id: I816dc9d8b22ff21d1b0b5485b95f56628fd1703f
tree: 7ef2783cc1c7ceb2904e517216ecf3ad05ec7527
  1. prebuilt/
  2. Android.mk
  3. CleanSpec.mk
  4. README