Merge "Revert "Frameworks/base: Fix a constructor""