Merge "log collector: per-device tmp dir and idempotent json processing" into oreo-cts-dev