Merge "Add samplerate and bitspersample keys"
am: 25b0f8dc2a

Change-Id: If218837cc00ff23da682aa5e9007f1a93c3918be