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

Change-Id: I6841fa95d7ad01057a4aa93af18a85674d1623e5