Merge "[MTE] Cleanup tagged si_addr refs to fix mappings OOB bug."