Update htmlescape to new package layout.

pkg/intl/intl.dart

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 /**
  * Internationalization object providing access to message formatting objects,
  * date formatting, parsing, bidirectional text relative to a specific locale.
  */
 #library('intl');
 
-#import('../../pkg/htmlescape/htmlescape.dart');
+// TODO(rnystrom): Use "package:" import when test.dart supports it (#4968).
+#import('../../pkg/htmlescape/lib/htmlescape.dart');
 
 #import('date_format.dart');
 #source('intl_message.dart');
 #source('bidi_formatter.dart');
 #source('bidi_utils.dart');
 
 class Intl {
   /**
    * String indicating the locale code with which the message is to be
    * formatted (such as en-CA).
@@ skipping 156 matching lines @@
 
   /**
    * Accessor for the current locale. This should always == the default locale,
    * unless for some reason this gets called inside a message that resets the
    * locale.
    */
   static String getCurrentLocale() {
     return _locale;
   }
 }