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

Change-Id: Ia69efff91e60657d1a965085a1133a88add02250