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