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

Change-Id: Ib24379428b41eb1ba34179facafd9b75b99434c5