Merge two methods of setting application class name in the manifest