am 35cdb5c8: am af321dc1: (-s ours) 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 '35cdb5c89ff8b3318f54338520982475bbf704f4':
  DO NOT MERGE - IAudioFlinger: clear config before reading it from parcel.