am 095641df: (-s ours) am 0518125e: am e1289226: am dc81adaa: am c191482e: Merge "DO NOT MERGE - IAudioFlinger: clear config before reading it from parcel." into lmp-dev
* commit '095641df':
DO NOT MERGE - IAudioFlinger: clear config before reading it from parcel.