Merge "Fix no sound with FDR-AX100 recorded 4k video"
am: 1984ca703a

Change-Id: Idb09ee4688ee7ce46c3986bc35eee54a41d1e19d