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

Change-Id: I55a6165b014b865b88bfe547b2c577945b596175