Merge "Fix libbase\'s logging dependency." am: ead369bdf0
am: 068e7f7d15

* commit '068e7f7d1591ae163777cec8d1404b77d92c2fd6':
  Fix libbase's logging dependency.