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

Change-Id: Ib9138ee5707a66226a04b704e804079b195da606