Sort arguments in buildifier order

Change-Id: I99de90eb39ca1022da3e7bc43aa05109d57e8a63
12 files changed