Merge "AudioEffect: add device descriptor to AudioEffect constructor" am: a2630442a7 am: 9007e168b4

Change-Id: I1259fc6cad7ecacf3551d9ebc4ba92188f8b048a