Merge "Lose recovery_l10n to bootable/recovery, where it belongs."