Merge "Add test config to libcutils_test" am: c1c0de3945 am: 0b842b37f6 am: 6a5c28d5af
am: d2cee19333

Change-Id: I0dfa6fde2647878279cd1b80403254f2ec42c487