Merge "Fix notice checking for PackageModule." into ndk-r14-release