Merge "libandroidfw: use map for more efficient indexOfString()"