Single-image boot image extensions. am: d0036ac18e am: 8fb55967ff

Change-Id: I4cfd387d566e20bda2e08c6a68b089235cf5bca8