merge in jb-mr1-release history after reset to jb-mr1-dev
diff --git a/tools/darwin/aapt b/tools/darwin/aapt
index fa2ecc0..20b29e3 100755
--- a/tools/darwin/aapt
+++ b/tools/darwin/aapt
Binary files differ
diff --git a/tools/linux/aapt b/tools/linux/aapt
index e685656..6f5364a 100755
--- a/tools/linux/aapt
+++ b/tools/linux/aapt
Binary files differ