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

Change-Id: Ia45aaf2ac6e36b3d960d97a65ecccd7ca6da83d3