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

Change-Id: Iaf533f30fb787fbc260eb8239f9522b709866d20