Merge "Revert "Libcore: Make java.security.Provider compile-time initializable""