Merge "Capture logcat early"
am: 8d2843ac29

Change-Id: I0d1ebfd03e41cbf6d0df9c5481e5c26bf41104b3