Merge "Fix discrepancy in SANITIZE_TARGET format with soong." am: 0d86fc57cd am: 0216097482
am: b8c54d7966

Change-Id: I89855ef8608e91b3ee046b237cc531ab7ab7d78e