Merge "frameworks/base refactoring"