Revert "FFC fix for m7"

This reverts commit 94f895ec0012b5b08f8fa3f4afabfe07b39e1b6f.

Change-Id: I24df8d7de4d00d8c8ec72f30862b8db19b3c9480
Merge "Revert "FFC fix for m7"" into jb-mr2