am 4b995f73: Merge "libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable." into lmp-dev

* commit '4b995f73b581ce0705b537317f32ad76bddb55fa':
  libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable.