199f6114d0
This partially avoids a difference in the include paths between a build and install tree, and simplifies the install configuration. Change-Id: If8119507594e0d284ac08c141c6c51c88ec619ef