am 8cfd0ac4: (-s ours) am 741a3351: Merge "DO NOT MERGE - IAudioFlinger: clear config before reading it from parcel." into klp-dev

* commit '8cfd0ac4b05f3151f1083564f46f05b5f525af8a':
  DO NOT MERGE - IAudioFlinger: clear config before reading it from parcel.