Merge "Remove testing of prebuilt npic boot images."
am: 078221e529

Change-Id: I4e8f6114e1e0dea815df71b59c6162d5b9c43ffe