Merge "liblogcat: LOCAL_C_INCLUDE_DIRS correction" am: 01815fdcc5
am: 88af7ccd58

Change-Id: I42228da35c3b2adb5c22fa18f005d28a23c74efc