Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master

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