Merge "libagl: support multilib build"