Merge "Collect update_engine logs in dumpstate" into pi-dev am: b6dc4034bf
am: 5138f41894

Change-Id: I00c9adc70ba12aae95e50be2e424fe78c4e5281a