resolve conflicts in android.policy.jar.out
resolve conflicts in framework.jar.out