Merge the single-image test to TestExtension. am: 3ea6627a74 am: 590d71f2b9

Change-Id: Id942800ed9ba145ba0608dba65980592863759d5