moz.build chages for ESR31

Cargo-culting some changes in that I saw applied to other moz.builds that successfully gets ctamlloc past the configure stage