Revert fimc changes from update11

Companion change to I4a654f10e9ccd50a744a710ecd01d2d26f67401d, it
is causing buffer allocation issues with our camera userspace

Change-Id: I507d678ee00dab7de7d08cb49acc98f82eb020b9