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

Change-Id: Ib15ecf93a981891ac0642e58c28a8289ae2dc665