Merge "Include custom partitions in dumpcache tool"
am: 3d83a673be

Change-Id: Ie6869449354f33183bf06e0802a5b70f5df021ad