Adds back the PhotoSphere View icon in filmstrip.

This also exercises the "leave a place cleaner than you found it" rule
by cleaning up stuff:

- Formatting according to the Android format rules
- Removing unused code
- Putting braces where they belong.

Change-Id: Ie1dbfe9195bf3e20d9624d7ae85eeba16df8f931