Merge "Remove unused symbols in framework/base"