resolve merge conflicts of e9d901a to nyc-dev am: 3b1cbcd66a
am: 38660e5dfc

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