Merge changes I1bfa797e,I0ec7a70e into integration

* changes:
  fix(tree): correct some typos
  fix(rockchip): use semicolon instead of comma

diff --cc include/arch/aarch32/arch.h
Simple merge

diff --cc include/arch/aarch64/arch.h
Simple merge

diff --cc lib/el3_runtime/aarch64/context_mgmt.c
Simple merge

diff --cc plat/common/aarch64/plat_ehf.c
Simple merge

diff --cc plat/nvidia/tegra/soc/t194/plat_ras.c
Simple merge