Merge "Use AOSP package name"