Merge "Fix copy/paste errors in use of AAUDIO_FORMAT_UNSPECIFIED" into oc-dev
am: 160078a070

Change-Id: I2bca3e8d3c1045663603bfb620bb059de5d6d62d