Revert "Merge branch 'fx-mh-builds-dev' into apk-split"

This reverts commit f86b6257a7f3f97b83994a15ffefe0b42a4fb5b0, reversing
changes made to 0b9c566c34be6407da61ac0f911610f2a37bdb86.
fixes constrained api 9 mozconfig typo
Merge branch 'apk-split' into apk-split-dev