Merge "Normalize building generic system image with treble-common.mk" into oc-dr1-dev am: 34b018804d  -s ours
am: c60ab6e80e  -s ours

Change-Id: Id7273507ae15ffb8a55ab8099dc12aba211c852d