Android CTS 7.1 Release 4 (3866195)
Add a varition in common scripts to support sailfish blobs
am: 6ff7343b64

Change-Id: I797e689f321a51c0993861372820c7292a7889ff