Final fix for Bionic KitKat (1/2)

From AOSP-S4 (last commit: fix compile by kufikugel)