Merge "Revert "Revert "Create libbase."""