Merge "tombstoned: Support java trace dumps." am: 24bccbcf98 am: eaff9c981c
am: 49e5109de5

Change-Id: I638b12e7f1ef14cb3603f4e0adf02fc5a8d35555