Merge "Revert^2 "Mark threads started by Daemons.java as systemDaemon"" am: 2b958a70 am: 2e5b0892 am: 85b564fe Change-Id: I85422e169fb81782ffcfea867268032be0c63ac4