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

Change-Id: I2df901a03f04a3c3e9981c3a5bdd33bb610dcbba