Merge changes from topic "cherrypicker-L09000000956548908:N73400001298271020" into tm-qpr-dev

* changes:
  Split log_capture into android and host targets
  Wait for a string to appear in logs.
  test: log capture add fd sync