Single-image boot image extensions.
am: d0036ac18e

Change-Id: I6bc96f579a72fe2374f454fd44cef27f176a72e8