Merge "Fix support_library build" into mnc-ub-dev