Merge "Check the size of the strings in the StringPool before flattening." into pi-dev
am: 7281fe0a9b

Change-Id: Id32a86c95b8a6da72e0abe20dc0e47355809e442