git apply the patch from i9100 and merge rejects

for framework.jar (smali/android/app/Activity.smali is not modified)