Merge "Fix linker_asan[64] apex bootstrap build error"
am: ca8ec381a0

Change-Id: Ic679601af9116b6997add7cb9c3fa599d10778d9