Merge "classpath: add renderscript source directory"