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

Change-Id: I346b3db3c9a733ae017da4cc016878b6c8dd6d70