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

Change-Id: I83538f1ea8e0ea7ef7fe1c234a2ad7cccfd2d6d7