clean up build script; add cbfs files for final output

Change-Id: I8efc369e6ebe91b611aace75d43ba9d94a22d47c