Merge "Switch to android.service APIs"