Merge branch 'clang-format' of https://github.com/gangliao/Paddle; branch 'develop' of https://github.com/PaddlePaddle/Paddle into clang-format