Update toplevel build

Change-Id: I0686e8ecb168e2c3a5eb641ea1665ed9acedd4aa