Merge "More rsh headers for renderscript and a llvm compatible test script for fountain."