am 5398f3d4: am 0d50e757: (-s ours) am 821b6c29: Merge "audio policy: populate attributes for attached capture devices" into mnc-dev

* commit '5398f3d4f2294b9628ce3ac8b2cb35daa48b4f9b':