Merge "Fix a use-of-uninitialized-value warning."

am: 500cf67206

Change-Id: I8b171a90696e09c42a1506255bc4c0056f69f35c

core/jni/android_hardware_SoundTrigger.cpp

@@ -509,7 +509,7 @@ android_hardware_SoundTrigger_loadSoundModel(JNIEnv *env, jobject thiz,
     sp<MemoryDealer> memoryDealer;
     sp<IMemory> memory;
     size_t size;
-    sound_model_handle_t handle;
+    sound_model_handle_t handle = 0;
     jobject jUuid;
     jstring jUuidString;
     const char *nUuidString;