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