Merge "Add test config to libcutils_test"
am: c1c0de3945

Change-Id: I6db1561c2153df96a7c4faa166963b0d1855e285