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

Change-Id: I5a42bd31c264dc103d65cf9b72ce210659998aed