Upgraded build-tools version - Added API levels 20 and 21