am d7c205fe: am 522019f1: Merge "libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable." into klp-dev

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