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

Change-Id: I526f3296e82c342da7668d0a270fdcb1f89ec05c