Merge "Add search paths for asan build"
am: 0121807851

Change-Id: I360d663b0fd6ec9cc4093af8c67ba6531139e761