Merge "fix(rockchip): fix "unexpected token" error with clang" into integration