apache: Fix board build error
Squashed update of kernel from 3.4.95 to 3.4.96
block: bfq: Squashed update from BFQ-v7r4 to BFQ-v7r5

Change-Id: I749ef141246db7020cec0b10d980ec854a572603