Merge "RenderScript-specific build updates for LLVM rebase"