Merge "__cfi_slowpath[_diag] are available to NDK and VNDK clients" am: b1c3da1d89
am: 510d9236dd

Change-Id: I31c4f6a26932e9f6564704a82016a629483a3d5b