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

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