Merge "liblogcat: LOCAL_C_INCLUDE_DIRS correction"
am: 01815fdcc5

Change-Id: I28a7645ab5375f234b74c6555f774510cb364a8e