Merge "Update paths for frameworks/base/config"