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

Change-Id: I629aeeb20e8de923a262df91c8dd14f4820cac5a