Merge "Fix build for native package"