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

Change-Id: Ica72a35de96d7cf376086809022cdb8e5a671ac1