Merge "FP2-1575: libstagefright: fix handling of mSampleTimeEntries" into fp2-dev-v2