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

Change-Id: Ic310e77556ac9eb0495fc98b938538a0d15485f9