Fixed more discrepancies with java/android coding conventions.