Fix build after android-4.2.2_r1 merge from AOKP