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

Change-Id: If444d905565b03f4a337e295582a65c532a5a9e1