Merge "rockchip: px30: Fix build error" into integration