Merge "AMediaExtractor: expand subsample sizes from 32-bit to size_t"