Merge "Return bits per sample and sample rate as metadata" am: 814b68373d
am: 2132849552

Change-Id: I91e63ee36caee0f64af42c1af422b8a8dc2a8b18