Merge "Allow jarjar com.android.server*"