am e4bcb3f8: am 238a487a: am e3cb2507: am 4b995f73: Merge "libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable." into lmp-dev
* commit 'e4bcb3f8':
libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable.