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

Change-Id: Ia2e6b86fbe5096b9419511edf7c3baf78e8aaee5