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

Merge commit 'df9f6a80788c25da9a8fafd2bfc69f4e772f5b5e'

* commit 'df9f6a80788c25da9a8fafd2bfc69f4e772f5b5e':
  Dummy java file in native-only apps is not needed anymore.