Merge "Delete BUILT_SYSTEM_MATRIX." am: c08c4d873f am: e4156656aa

Change-Id: Id9a77fa26a8b1e7f057faad3629359d097d6070a