Merge "Revert "Normalize building generic system image with treble-common.mk"" into oc-dev am: 8199b9d1fd  -s ours am: 74066efb32
am: 8e4ac36fba

Change-Id: I29beee0749a6926debc1965ae923902634c089af