Normalize building generic system image with treble-common.mk
am: 6fdff23df2  -s ours

Change-Id: Ib756e5c3860de718fb2efecd706175983ca08f27