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

Change-Id: Idc35a4de4fd0cc08297ea96ece4e0e081c0783d5