Merge "ipq807x: fix compilation issue"