Merge "Require liblog for libbase in all configurations"