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

Change-Id: Iaac36688bbe09708e4c26a87ea7aacf17412e2cf