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

This reverts commit 1ba223b2e6dab206b02613bc8b523553477fc4a0.

Change-Id: I0048afcefc5b654b62ddaf3c0d45ab201e4d3027
9 files changed