Merge "No longer traverse files to get folder size." into arc-apps
am: d1384dd833

Change-Id: Ibfd821b105e86788964437dcfa938d9f7fa466f9