Merge "More work on the renderscript sample"