am 8a042d4e: am f3a6934b: am dd2502bd: Move declarations to the top to avoid potential uninitialized use.

Merge commit '8a042d4ee0fe84ca1f9a22090df3305782bcff67' into dalvik-dev

* commit '8a042d4ee0fe84ca1f9a22090df3305782bcff67':
  Move declarations to the top to avoid potential uninitialized use.