Add a newline to the end of satchel.manifest because, although I have no clue why and that scares me, the lines are being re-ordered during the mac install process and the unterminated line becomes a parse error.

toolkit/components/satchel/src/satchel.manifest

@@ -1,4 +1,4 @@
 component {0c1bb408-71a2-403f-854a-3a0659829ded} nsFormHistory.js
 contract @mozilla.org/satchel/form-history;1 {0c1bb408-71a2-403f-854a-3a0659829ded}
 component {c11c21b2-71c9-4f87-a0f8-5e13f50495fd} nsFormAutoComplete.js
-contract @mozilla.org/satchel/form-autocomplete;1 {c11c21b2-71c9-4f87-a0f8-5e13f50495fd}
+contract @mozilla.org/satchel/form-autocomplete;1 {c11c21b2-71c9-4f87-a0f8-5e13f50495fd}