The next revision, 19185, renames several runtime files, and will be handled in a separate change. From-SVN: r211328
