Merge "Revert "Normalize building generic system image with treble-common.mk""...
Merge "Revert "Normalize building generic system image with treble-common.mk"" into oc-dev am: 8199b9d1 -s ours
am: 74066efb
Change-Id: I632a7527821c0a585b10a9f36d5ba760b1beb506