Fix build after android_4.2.2_r1 merge from AOKP