Merge "Simplify catapult build"

Author: Treehugger Robot

build/sdk.atree

@@ -57,10 +57,7 @@ development/sdk/generated-api-versions.xml    platform-tools/api/api-versions.xm
 prebuilts/sdk/sdk-annotations/annotations.zip   platform-tools/api/annotations.zip
 
 # systrace
-external/chromium-trace/catapult/common/                                  platform-tools/systrace/catapult/common/
-external/chromium-trace/catapult/dependency_manager/                      platform-tools/systrace/catapult/dependency_manager/
-external/chromium-trace/catapult/devil/                                   platform-tools/systrace/catapult/devil/
-external/chromium-trace/catapult/systrace/                                platform-tools/systrace/catapult/systrace/
+external/chromium-trace/catapult/                                         platform-tools/systrace/catapult/
 external/chromium-trace/systrace.py                                       platform-tools/systrace/systrace.py
 external/chromium-trace/NOTICE                                            platform-tools/systrace/NOTICE
 external/chromium-trace/UPSTREAM_REVISION                                 platform-tools/systrace/UPSTREAM_REVISION