Merge "[RenderScript] L2 BLAS, fix element type in ZHER"