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

Change-Id: I63338c59f4c27efeccb29ebfc98ddac826ccc439