Allow newer versions of the build tools

Change-Id: Ia4f422860f4ab3884c49f03eb7b791473b91dc05