Revert commits that break the build.

This undoes commits that broke the builds. Done manually since there two seperate merges that broke the build.

#32 - used a GridLayout that isn't compatible with < API 14
#39 - NPE in Fragment