Some indentation and code style changes to java/android.