Merge "Suppress use of ASan on e2fsdroid temporarily."
am: f5efc9e047

Change-Id: Ic40fed396f4f20ddb6f1e94b3183cab1c422f153