Fix verifier typing for null float arrays.

Since the array is null, the verifier would get confused about its type.
Now it's treated as zero to allow it to be merged later without conflict.

Bug: http://code.google.com/p/android/issues/detail?id=24814

Change-Id: Id7e96f5d2fd4879c9eaa8535c2b9ae95b0b78cff
diff --git a/vm/analysis/CodeVerify.cpp b/vm/analysis/CodeVerify.cpp
index 65c79db..4a0d3d7 100644
--- a/vm/analysis/CodeVerify.cpp
+++ b/vm/analysis/CodeVerify.cpp
@@ -4490,7 +4490,12 @@
                     failure = VERIFY_ERROR_GENERIC;
                     break;
                 }
-
+            } else {
+                /*
+                 * Null array ref; this code path will fail at runtime. Label
+                 * result as zero to allow it to remain mergeable.
+                 */
+                tmpType = kRegTypeZero;
             }
             setRegisterType(workLine, decInsn.vA, tmpType);
         }