Merge "Remove  config in frameworks/base"