DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master

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