Merge "Add test config to libcutils_test_static" am: c65f842cd1 am: ad6c88f108 am: 838b61c11f
am: 224cc80862

Change-Id: Iaf00616ae3fec0bc5a36788b714075a6cdee841d