Improve formatting in monkey code

Now that preupload checks are in place, let's fix a few of the current
issues so that future "repo upload" commands only show problems in the
code that's actually getting altered.

Bug: 344695913
Test: repo upload .
Flag: EXEMPT refactor
Change-Id: I0db4474d08e0e74f2a9c3e15bb435f0213dd3fb4
2 files changed