[asan] Merge from trunk
This merge brings the branch up to trun revision 192857. Tested on x86_64. Diego.
[asan] Merge from trunk rev 192612
No big surprises. I will keep merging the branch from trunk weekly until we are ready to send the branch for trunk review. Diego.