Merge "Modify slang to emit RenderScript DWARF tag"