Merge "Remove unnecessary dynamic dependency on libbase."