Merge cherrypicks of ['googleplex-android-review.googlesource.com/21683219'] into security-aosp-rvc-release.

Change-Id: Ie70bf6ff9d0957b9a5893bb634a04881898bc5ca
tree: 702a64f834ea28c20c72f6607eadf383af879e90
  1. 1.1/
  2. 1.2/
  3. extns/
  4. halimpl/
  5. Android.bp
  6. OWNERS