Merge "Set bits per sample for FLAC and WAV" am: b01ea19315
am: 51db995237

Change-Id: I1c798f0d2950b240239f8749cea66d12b6a11008