Merge "Some refactoring in BackgroundDexOptService."