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

Change-Id: I4dc624b34c2bcf1c73f10ec615cf8b1ecd334430