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

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