Fix conflict in android framework