Merge "Revert "Create libbase.""