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

Change-Id: I771bc638f52ba44b232d9729c365b181378f2411