Merge "Use %z instead of %l for size_t." am: dc41c87d63
am: 2cc71ed02d

Change-Id: Ie2b251f9e8f9db047bfcdba8d875a325c5e4cbc9