Merge "Delete BUILT_SYSTEM_MATRIX." am: c08c4d873f

Change-Id: Ib72412d98e9a9059069ccd6dd4943086fc2b3ffb