Merge "bootstat: Set up clang-format-2 for bootstat." am: efb30b0ccd
am: 58730e3ec0

Change-Id: Ia96521a16d5b19a7e1321ee8c66b4d619e080716