Merge "Cleanup bionic tests with hwasan."
am: f827d82cdd

Change-Id: I4fdb412f57a08ea9401897a0642014e848e51194