Merge "Add LOCAL_EXPORT_C_INCLUDES_DIRS to library builds."