Revert "Changes to allow BFQ compilation"

This reverts commit 14deeee4b6e3aa4a9a34607bbdd5b34cad4a79c8.
Enable BFQ

Change-Id: I59917d9f98795277730c56de799d4da2d6dac2e6
Set of BFQ improvements

Taken from fishears
&
Early Queue Merge for BFQ by Paolo
Bump version to 1.4

Change-Id: I41493a6bef6c4033edfa5362e79b9a84b1399796