[automerger skipped] DO NOT MERGE - Revert "DO NOT MERGE - Merge Pie Bonito/Sargo into master."
am: 6f867555ed -s ours
am skip reason: subject contains skip directive

Change-Id: Ib64bf640e46461d85388bbe6808f21971f4bfae7
tree: e92a8b419a0ff3796e55e99f212516a9b1696cbb
  1. Android.mk
  2. CleanSpec.mk
  3. README
  4. prebuilt/