resolve merge conflicts of e9d901a to nyc-dev am: 3b1cbcd66a  -s ours am: 7d0e41158b am: cc02176d06
am: c435b04a68

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