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

Change-Id: I7e5bb4fddb05b1a39f1fc58260a8485675fa3363