Merge "Build a core-current-stubs-for-system-modules jar"