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

Change-Id: I9ac18bf9e2fadebf764c9d519d822048f0908664