Merge "stubs inheriting from framework-module-stubs-defaults-* now works"