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

Change-Id: I5218c8aedc44a9c6562c8313e44aa1f31dbd4a0a