Merge "Use the 2 space clang format for libunwindstack."
am: 4b9a555a0f

Change-Id: Ifb0a52a2f99ddd69b4fe7196b749a985b7851be5