Merge "DO NOT MERGE ANYWHERE tombstoned: Avoid creating the tombstoned_java_trace socket." into oc-dr1-dev am: 53ce94588b  -s ours
am: 385a5dc03a  -s ours

Change-Id: I59df897bad916cf7facd62469e11c05f977ed3dd