Merge "Revert "Normalize building generic system image with treble-common.mk"" into oc-dev