[automerger skipped] Merge "Make aosp_$arch system images closer to GSIs" am: 3527ff9b84
am: ce3d0038a0
-s ours
Change-Id: I130029f47592d86983c32325ecad57c270d3bcbb
This commit is contained in:
commit
cb403acee8