Merge "Fix a few bionic test failures caused by hwasan global instrumentation." am: 3952113d90
am: 752b619240

Change-Id: I19c451f8ecc6011e819f8fa2bef0151e0ee1dc37