Merge "Normalize building generic system image with treble-common.mk" into oc-dev am: 317e4b918d  -s ours
am: 8c7dffd7bf  -s ours

Change-Id: Ie1f78d081be328c53f708494e2396a8216aafe5d