Merge "Add error message on support lib build failure" into mnc-ub-dev