Merge "Enable CFI for libstagefright_foundation."