Merge cherrypicks of [16736103, 16736104] into sc-v2-release.

Change-Id: I092ca9f4a4c0c8c7968db29034a8476c2f82a62e
tree: d5a19c65300c5b3e141c23c890ec32dede715737
  1. .prebuilt_info/
  2. 1/
  3. current/
  4. Android.bp
  5. METADATA
  6. OWNERS
  7. SoongConfig.bp