Merge "Convert Renderscript Hal test to test against each of the service names."
am: 4fae0e4f75

Change-Id: I76769806c8e90411055c4864b57e8271cc1894a8