Merge "Fix discrepancy in SANITIZE_TARGET format with soong."