Merge "Produce resource package for support-v4 and support-v13"