msm8974: Improve FX path

 * Previous change had bad performance in certain situations.

Change-Id: I5310fca65b8c5ff651facb0bcb0f0e19969bee5a
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0