Add some more source files for debugging convenience

Change-Id: Ic058067f4114662569433801d8627e1c6fe648aa