[automerger skipped] DO NOT MERGE am: 42c2f014f2  -s ours am: 778bfd3630  -s ours
am: 0c94609336  -s ours

Change-Id: Id31abc62659891fb60afae7302f71199cd658d63
tree: 5f7a3210ec3a7bed3fb3014ffcd83e6f29e5829c
  1. kernel-headers/
  2. original-kernel-headers/
  3. msm8996.mk