Merge "Cleanup run-test and Makefile around boot image and PIC."