Merge "Revert "Remove renderscript related samples""