Merge "Add search paths for asan build" am: 6b6259a083
am: 8e206db77b

Change-Id: I91817777e6ba0fed2bf7ca9474843c3430b1e973