Merge changes from topic "rockchip" into integration

* changes:
  fix(rockchip): add parenthesis for BITS_SHIFT macro
  fix(rockchip): xlat: fix compatibility between v1 and v2