Merge "Fixed thread leak in OomAdjuster during tests"