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

Change-Id: I235b9c3562265de05a6ddc71ed8fe61c125e413e