Squashed commit of the following:

commit 487bc26b726a839b2e46424ee3779ac3bb2033f6
Author: Nicolas Geoffray <ngeoffray@google.com>
Date:   Mon Sep 12 14:24:12 2016 +0100

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

    This reverts commit 8c9ccac0.

commit cefadb4b835390b508ae1d2b899f39f3769a593a
Author: Nicolas Geoffray <ngeoffray@google.com>
Date:   Mon Sep 12 14:23:47 2016 +0100

    Revert "Update test and dependencies after boot image changes."

    This reverts commit 2a1a8d7f.

Change-Id: I58731d845c1166406039a9b74c833d72a82c88fb