Merge "audiofx: add device descriptor to AudioEffect constructor" am: 1eca4b7389 am: 24aeeb12ea

Change-Id: Iab6550a3f5eabe2a72d68753e30eada552e875fc