Android cts 11.0 release 6
[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
am: 557b6f7ebd -s ours
am skip reason: subject contains skip directive

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