Merge changes I92cac83b,Ie897c40b

* changes:
  logd: wakeup wrap timeout if realtime changes drastically
  logd: cap how far back in-place sort will go to 5 seconds
tree: 03d8a00e2d6b40c4a3c0f79609616ba421321fa5
  1. liblog/
  2. logcat/
  3. logd/
  4. logwrapper/