Merge from master

Change-Id: I0cecc81f9b34cb6d965d2a8528ced3f45d931436
diff --git a/default.xml b/default.xml
index 1a77ac3..5af4cfa 100644
--- a/default.xml
+++ b/default.xml
@@ -96,6 +96,7 @@
   <project path="external/guava" name="platform/external/guava" />
   <project path="external/hamcrest" name="platform/external/hamcrest" />
   <project path="external/harfbuzz" name="platform/external/harfbuzz" />
+  <project path="external/harfbuzz_ng" name="platform/external/harfbuzz_ng" />
   <project path="external/hyphenation" name="platform/external/hyphenation" />
   <project path="external/icu4c" name="platform/external/icu4c" />
   <project path="external/iproute2" name="platform/external/iproute2" />