Merge "Remove LocaleValue::toDirName() from AAPT2"