Merge "MPEG4Extractor:media timescale for audio delay/pad"
am: 4462ff08c4

Change-Id: Ib02b4a3c7fbd8824a9850f27a17b81aa6746f478