Update the build tools.

Also use v21 support libraries.

Change-Id: I68df75a10f90fb0db4a1048de4b6c300b8d3250e
2 files changed