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

Change-Id: I084b31cf13e770c60f8314f45901e6d514dc9321