Merge "Fix regression in renderscript detection." into lmp-dev