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

Change-Id: I21b66d35d6276d95e160054c0afa6386232d1f6b