block: row: squash commits from codeaurora.

Change-Id: I4b2da028b463005cff7f7ab58ddfdaf1c77d6792
Signed-off-by: franciscofranco <franciscofranco.1990@gmail.com>
block: fixes required to make the kernel compile with ROW.

Change-Id: I162bf4e86c611093270929059ca594651512d51f
Signed-off-by: franciscofranco <franciscofranco.1990@gmail.com>