Merge "Move empty module handling to ModuleDef" into nougat-cts-dev