Bug 923950 - Fix Android l10n single locale repacks on Beta. r=glandium, a=bajaj

This uplifts just enough of the fixes from Bug 951238 (which itself
fixes Android l10n single locale repacks after Bug 934646) to fix
repacks on Beta.