Johnson sets out £16.5 billion defence spending boost