Merge "Pass the right loading package when registering dex modules" into rvc-dev