Merge "fixing resource browser for renderscript samples because the samples moved"