Merge "style(plat/arm/corstone1000): resolve checkpatch warnings" into integration