Updated to get a working build and added ROMstats

Change-Id: Ic84c7b7b7091f39f33af02492c45dd650e2dec5f