[automerger skipped] DO NOT MERGE
am: 42c2f014f2  -s ours

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