Merge "frameworks/base refactoring."