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

Change-Id: I07e9c836dee8f49981e370f0feabe417cd3d7337