Add more source files for easier breakpointing in Xcode

Change-Id: Ibe97fe4a105d048c02d3af5263efc68d486afb06