Reconcile with jb-mr2-zeroday-release - do not merge

Change-Id: Ia430ad311d9a3c38499ccfd480283e992dc7214d
tree: f5569834e91d51fd75ee0d6546f6505c979644ea
  1. kernel-headers/
  2. original-kernel-headers/
  3. msm8960.mk