Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
am: d9993c48c1

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