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

Change-Id: I305201f801b3e87c269b712ced55c61f54095146