merge in nyc-mr1-release history after reset to nyc-mr1-dev
tree: 3f3c608f40e4b1827fcf5c32f974e3f13c5e2d1f
  1. kernel-headers/
  2. original-kernel-headers/
  3. msm8996.mk