Merge changes I3ec14f04,If580b968,I54c05549,Ia9ddbaf6,Ibce07e5d
* changes:
Merge remote-tracking branch 'toybox/master' into HEAD
Convert more option vars to the new (single letter) coding style.
Trivial cleanup of uniq.c.
Discard harmless error messages.
Update news.html for 0.7.8 release.
diff --git a/Android.bp b/Android.bp
index a2a02f7..388a05b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -24,7 +24,7 @@
// git merge toybox/master
// # Regenerate generated files.
-// make
+// NOBUILD=1 scripts/make.sh
// # Make any necessary Android.bp changes and rebuild.
// mm -j32