Merge "Fix copy JNI files of Term.apk" into cm-10.1