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

Change-Id: I7175378f9c43ca1c471b1ed725525e42a3ca3ef6