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

Change-Id: I8b01cfc2fded72aef274e620c44970e0f67d146d