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

Change-Id: If309387e374e48d5e72364b3da4fd4522ba16da1