Merge "liblogcat: LOCAL_C_INCLUDE_DIRS correction"