Merge "Add apex available prop for libprofile-clang-extras_cfi_support"