Merge "Remove logcat's false dependency on a libutils header file."