Merge "Dummy java file in native-only apps is not needed anymore." into gingerbread