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

Change-Id: I287cc4ffd05fd7e3aec2772f4c0c660cfff1c2c8