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

Change-Id: I2383d305625a872c7ec44ce594c30bd5c17c2983