Android 6.0.1 release 3
am 23eb37d0: am 515e28dd: am a12313fe: Fix S_SMF_DATA.numStreams being non-zero while streams is uninitialized

* commit '23eb37d08f13fe570632bd26b4f2a830f16c1983':
  Fix S_SMF_DATA.numStreams being non-zero while streams is uninitialized