Merge changes Iefbea3b1,Ieb924b6d

* changes:
  liblog: add android_log_timestamp() private function
  liblog: logcat: add epoch and monotonic format modifiers