MFC r329534-r329535

r329534:
Arrange SRCS= as 1 file per line, alphabetical, so it's easier to maintain.
Whitespace only, no functional changes.

r329535:
Add iic_recover_bus.c, now part of iicbus. This should have been added
as part of r320463.