Fix Android 5.0.2_r1 merged derp