Upgrade android tools version and fix outputs handling