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

Change-Id: If081a864902872becae6662e5c63dcefdcbe9ac8