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

Change-Id: I3a00d4adc6472cdd2a61d1b940e8a7235f77df63