Merge "Revert "Optimize ResTable::getLocales() to improve bindApplication performance"" into nyc-dev