Merge "Fix asan paths in ld.config"
am: a13b119c3d

Change-Id: Iebae1ad41aedaea66e97931d5abc7b6a5ab460e0