Updates to Android config and Java class