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

Change-Id: Ib617a339cba0ae957505c4439e1052f3bfd9e526