DO NOT MERGE  Remove tools/tradefederation from aosp/master for build reasons.

Change-Id: I66660d75a89ab8dc20d3660a6b873a9f6960bc28
Merge remote-tracking branch 'upstream/master'

Conflicts:
	default.xml