Consolidate boot.img files
Consolidate system files