Merge "Fix asan permitted paths in the default namespace." am: 32c03800c0
am: 22e81897b2

Change-Id: I2326402e405cc95c0a42e2962b86c7fc438d19de