Merge "Fix qtools build."