am d641c70a: am 79c7207e: am 01afbf07: am fbac8266: am a205e4ae: am 9b6d2426: am bd96da22: am b53cdf49: am d7c205fe: am 522019f1: Merge "libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable." into klp-dev

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