Merge "Increased number of Android log lines for tombstones" am: 3e58777255
am: be281d0b56

Change-Id: I8c05ac24d7cc3cf6e5a0403716456b9da5219060