Android 7.0.0 Release 33 (NBD92G)
resolve merge conflicts of e9d901a to nyc-dev

Change-Id: Ic0a5d1893786ae8a6a5b207f01da14ed93bfac0a
6 files changed
tree: 821ba50e2a3168bb8fd08202408d092f87882e2f
  1. prebuilt/
  2. Android.mk
  3. CleanSpec.mk
  4. README