Move inner classes out of FolderIcon.
am: cb73920b23

Change-Id: Ia86985345a70de769e5cbdd08ef0969ecb6eab73