base/native && system/core diffs