Merge "fix uninitialized variable in SoftVideoDecoderOMXComponent.cpp" into oc-dev am: 17d79b7da5
am: e7f9a85b66

Change-Id: Ie409fe1f88acf2718da7144c7570dc8bbf53ed0e