Merge "ipq806x: Fixed compilation errors" into eggplant