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

Change-Id: I2da933c3bb0d408bc6828fe9f8bd51fc4cd58f9d