Version 1.5.0-dev.4.21

Partially merge revision 37172 by merging:
https://codereview.chromium.org/353473002

R=kasperl@google.com

Review URL: https://codereview.chromium.org//345373003

git-svn-id: http://dart.googlecode.com/svn/trunk@37583 260f80e4-7a28-3924-810f-c04153c831b5
diff --git a/pkg/pkg.status b/pkg/pkg.status
index 2e7489c..a0b87f4 100644
--- a/pkg/pkg.status
+++ b/pkg/pkg.status
@@ -88,6 +88,7 @@
 [ $compiler == dart2js && $runtime == drt ]
 web_components/test/interop_test: Pass, Fail # Issue 19329
 web_components/test/interop2_test: Fail # Issue 19329
+third_party/angular_tests/browser_test/core_dom/shadow_root_options: Fail # Issue 19329
 
 [ $compiler == dart2js && $checked ]
 crypto/test/base64_test: Slow, Pass
diff --git a/tools/VERSION b/tools/VERSION
index dfbe995..52aa6e8 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -28,4 +28,4 @@
 MINOR 5
 PATCH 0
 PRERELEASE 4
-PRERELEASE_PATCH 20
+PRERELEASE_PATCH 21