Distinguish Andromeda and Android for SurfaceComposition test.

Use different surface composition performance score thresholds for
Andromeda and Android devices.

BUG=24158847
TEST=Flushed Nexus 9 device using volantis and volantis-andromeda
     images and confirmed that corresponding threshold is used
     for each image.

Change-Id: I8989741200e6584d142479acc1dea7ce8642b1d3