Merge "Collect update_engine logs in dumpstate" into pi-dev