Merge "Revert "Include core library jars in runtime apex.""