Merge "Increase vtable size for String class" into nyc-dev
am: b66bf30

* commit 'b66bf30ae959fe1e8ff8b7b3ff52ac367d2c9b10':
  Increase vtable size for String class

Change-Id: I51f171f36d4a2227502e19e23b0eeba92a005d27