Fix Android 4.4.2 merge derp