Merge "Delete INCLUDED_DEFAULT_DIRECTORIES from extras received over binder" into rvc-dev