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