Merge "art: convert makefiles to support multilib build"