Merge "Make java_system_modules visible to sdk" am: 886a9538a1

Change-Id: I7b3bb8d190a17d45394032dd75e8727ed3436809