Merge "Replace LOCAL_C_INCLUDES with header lib dependency."