Merge "[VOL-5194] - Update repo to use library makefiles."