Merge "Update paths for frameworks/base/config" into oc-mr1-dev