Merge "add support for LOCAL_MULTILIB"