Merge "Allow java_system_modules_import to replace java_system_modules" am: 1876a762 am: b51bc93c Change-Id: I33de58799d75671c9a000598a31a72eb7bc6db66