Merge \"Apply SANITIZE_TARGET and LOCAL_SANITIZE when both are present.\"
am: 9c88e0bfa2

Change-Id: I828de48b2f552801ec83c11f493eaaacb5f83e47