Merge Android Pie into master
am: a16b75776f

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