am 9b6d2426: am bd96da22: am b53cdf49: am d7c205fe: am 522019f1: Merge "libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable." into klp-dev
* commit '9b6d2426':
libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable.