Merge "__cfi_slowpath[_diag] are available to NDK and VNDK clients" am: b1c3da1d am: 510d9236 am: 89db25a0 am: 6542e1b9 Change-Id: I45e51291b51661d37e7ee26f43742ce23a05876d