git apply the patch from i9100 and merge rejects

for framework2.jar