[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:
Isaac Chen 2018-04-23 19:31:25 -07:00 committed by android-build-merger
commit cb403acee8

Diff Content Not Available