Merge "Add test config to libcutils_test_static" am: c65f842cd1
am: ad6c88f108

Change-Id: I3f6e77a45949d7685f2fc09776f2c34cd3ca879c