Merge "Revert "Disable design lib in master build file"" into lmp-mr1-ub-dev