Merge changes I84bfadd3,I150677ff

* changes:
  Avoid showing too many entries in the pie chart once.
  Add support to analyse the disk usage by file extensions.
diff --git a/build/sdk.atree b/build/sdk.atree
index b6d8e25..5862e57 100644
--- a/build/sdk.atree
+++ b/build/sdk.atree
@@ -56,11 +56,6 @@
 external/chromium-trace/NOTICE                                            platform-tools/systrace/NOTICE
 external/chromium-trace/UPSTREAM_REVISION                                 platform-tools/systrace/UPSTREAM_REVISION
 
-# Compatibility: moved to platform but also leave them in platform-tools for a little
-# longer until all active Gradle plugins have support for looking in both places
-${OUT_DIR}/target/common/obj/PACKAGING/framework-doc-stubs_generated-api-versions.xml    platform-tools/api/api-versions.xml
-${OUT_DIR}/target/common/obj/PACKAGING/framework-doc-stubs_annotations.zip   platform-tools/api/annotations.zip
-
 ##############################################################################
 # Build Tools Component
 ##############################################################################