am 6fa09f77: Fix the format conversions, again.

Merge commit '6fa09f77cda8be8505897881a74821886c5aa116' into dalvik-dev

* commit '6fa09f77cda8be8505897881a74821886c5aa116':
  Fix the format conversions, again.