Merge "Update paths for frameworks/base/config" am: e984c78faf am: e3196ada4c
am: 2cbb80d5b4

Change-Id: Ide5d2b3f10df3992ed7c825e2bcf79dc3e4a5e7f