Merge "Package dpi specific resources when Jack is enabled"