Merge "Normalize building generic system image with treble-common.mk" into oc-dr1-dev
am: 34b018804d  -s ours

Change-Id: I605a82f27a4185326da79c9808485f9e94579221