[automerger skipped] Merge "Align base_system and core_minimal with internal."

am: a37da42c12  -s ours

Change-Id: I70c1f38e1e8786f898b290b33d237125d67ebd58
This commit is contained in:
Anton Hansson
2018-07-09 23:38:40 -07:00
committed by android-build-merger

Diff Content Not Available