Merge "Change adding of libutils and libcutils to libutils_headers and libcutils_headers resp."
am: 0e5e3a61c2

Change-Id: I1f571e5b2f873fc8a8affe07db9c8c5fbfb96b01