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

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