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