[automerger skipped] Merge "Set bits per sample for FLAC and WAV" am: b01ea19315 am: 51db995237
am: ac13625171  -s ours

Change-Id: I78d8fb4df9521f64b25f8255a8a89e1ab43fd681