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