Merge "dumpstate: acquire /data/misc/logd/ log contents" into nyc-dev