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 'f077abb00ba4003738c3ca5c8133e2e3d22692c6':
  DO NOT MERGE - IAudioFlinger: clear config before reading it from parcel.