Merge changes I2bb2cb29,Ie52ebe19

* changes:
  audio flinger: fix use of local variable after std:move
  audio flinger: report actual sink device for MSD playback threads