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

Change-Id: Ibf8e7d4d5281330ad38c32fe98ceccf65bcfa2a6