Merge "skia: convert makefiles to support multilib build"