Merge "Support caching the suffix array." am: 02416b52d7
am: 511311dd75

Change-Id: Ic3f8bb3e4e67ce75174f4345376dbbdebf6bd2dc