am 2c872499: am e05b8b59: Merge "ART: Include zero-padding in String::SizeOf()."

* commit '2c8724993e12999a6e959ea055eabbb3f715c9cb':
  ART: Include zero-padding in String::SizeOf().