Merge Android Pie into master am: a16b75776f am: 79504e343c
am: 37569e7b13

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