Merge "Normalize building generic system image with treble-common.mk" into oc-dev
am: 317e4b918d  -s ours

Change-Id: Id89e03f1f0435ec80ac6a903516a704e836e8d33