Merge "Fix obvious typos under frameworks/base/core"