Merge "run-as: Use 2-space clang-format."
am: a50225ae36

Change-Id: I158f005798e18375474202e93926cbf6086fe36a