Merge "Fix issue #73818011: Please fix build error on frameworks/base"