Merge "Collect update_engine logs in dumpstate" am: 4d69f8ace9
am: 568d699714

Change-Id: Id59d55c895030e0841d22ccf01fd8306f23b9513