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

Change-Id: I75c6489adc15dcb819e1a8034f0764cdc49019d3