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

Change-Id: I43e12580fa9690e1b92150ab9712ca2a98823123