Merge changes Iefbea3b1,Ieb924b6d am: bb51fbc4d4
am: 9d4203aae1

* commit '9d4203aae178d23509e312c0db544fec1e8e6d7e':
  liblog: add android_log_timestamp() private function
  liblog: logcat: add epoch and monotonic format modifiers