Merge "Revert^2 "Mark threads started by Daemons.java as systemDaemon""