Merge "Re-indent clatd code with clang-format"
am: 5d1b880412

Change-Id: If70bca6c0308b9da56f662333b5f7c2fef409c4f