Fix up Android 4.3 Merge