Merge "Fix makefile for multi lib"