Merge "Allow "android" package name."