Merge "Replace LOCAL_C_INCLUDES with header lib dependency." am: 2cb9b1b621
am: 8ff5ee3a2d

Change-Id: I76062ef7dbe8da963441892536c9819382e7b779