block: bfq: Squashed update from BFQ-v7r1 to BFQ-v7r2

Change-Id: I90a2156ae874fed703aafa22b721f59a0db40c51