Migrate the build to use the latest CBI p2 aggregator

Change-Id: Ibbe00fb42e6af1cd4923f0fd5f20a2c777d33b64
Signed-off-by: Ed Merks <ed.merks@gmail.com>
4 files changed