am fac3bf35: Merge changes Id65ed2e8,Idbf8fae9

* commit 'fac3bf35af412292e1a955510095c4234dc0fd53':
  liblog: deprecate TARGET_USES_LOGD
  logd: deprecate TARGET_USES_LOGD