Merge \\\"Sanitizer build tweaks.\\\" am: 24dc27e643 am: bd9f3f6187
am: fd6304f541

Change-Id: I95c4d2cb618fffab1b7bb24d192c961a8a264ee7