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