Merge "Remove unused DexFile UTF-16-based string lookup"