Merge "no-image does not prebuild, so disable checker for this."
am: ca333f4093

Change-Id: Ib8f8677d4c3575fb9726fb15995bd2b33fb207bf