am f2e86153: am fac3bf35: Merge changes Id65ed2e8,Idbf8fae9

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