[ Merge of http://go/wvgerrit/87123 ] Certain android files have yet to be formated since we introduced clang-formatting. Test: built for android Bug: 134365840 Change-Id: Ia316b039e7469f7cf803464ee95a919fe7966450