Merge "Cleaning up pre-Gingerbread folders and classes"