Merge "rockchip: Prevent macro expansion in paths" into integration