Add Apollo to the build

Change-Id: I0ade81891e299e8247bca621d519ab7a58d1c7e9