Merge up through LLVM r163557.

Updated Android.mk source file for asan and fixed up test setup (thanks to
Evgeniy for the starter patch).

Change-Id: I4dcf13130505f4c1e2eed191a3b403ccab5e5e26
2 files changed