Merge "Revert "Disable the design support library and demos"" into lmp-mr1-ub-dev