Apply Aki's patch for nightly android l10n patch