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