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

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