Merge "Code cleanup to make formatting consistent across all the renderscript files."