Merge "Use the 2 space clang format for libunwindstack."