git apply the patch from i9100 and merge rejects

for android.policy.jar