Merge cherrypicks of [16089298] into security-aosp-pi-release.

Change-Id: Icb3bd2a1c81246ed1814b3c7f345c0db4fe40807
tree: 926e4b356aa62340220d368c21e122903d85746a
  1. 1.1/
  2. extns/
  3. halimpl/
  4. Android.bp
  5. OWNERS