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

Change-Id: I27396f9a401d3ff0b0ed16c4651a0917c511ecdc