Merge "tombstoned: turn on java trace support + unit tests." am: 3aaf17fc16 am: dcb4b80694 am: c6f30913bf
am: fcef1a6b13

Change-Id: I3df79218876fe4d7633442cccb924d232e78cc7b