Merge "Add more targets to NATIVE_BRIDGE_PRODUCT_PACKAGES"