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

Change-Id: I5fce7331aae05080d8a68155500ebda45dfe7246