Merge "Remove unused DexFile UTF-16-based string lookup"
am: b4b91460b2

Change-Id: I6ae0b722040f3e8d3af4ed54326903496f7a65cb