Fix building using kitkat1 branch