Added speaker-related cherry-pick

http://review.cyanogenmod.org/#/c/30858/