Initial buildfixes for Android 4.3