Merge "Revert "Revert "Normalize building generic system image with treble-common.mk""" into oc-dev am: 40b59b8950  -s ours am: afb4480425
am: dea8d2ec24

Change-Id: Ic7e6f75fc912e8ea89fdd92c9d1e3c753299f339