Merge changes I957c519b,Iaf4e389e,I92f8056b

* changes:
  logd: remove faulty optimization
  logd: don't store the map key in its value
  logd: use libbase logging