Fixes mismatch between Java and C++ indices.

Happened when a unicode character > 0xFFFF was present.

Bug: 38019270
Test: Built and tested on device. Google3 tests pass.
Change-Id: I8ca7e21eff7ea407ad75aa636f9cabfcc2259033
3 files changed