MFC r307800, r307801

MFC r307800, r307801

r307800:

  Sources from the "current" build tree and generated sources in the
  object tree should be used instead of sources and headers from the
  already installed source tree on the build host.

  This was noticed while addressing issues in the upcoming amd update.

r307801:

  Align whitespace.

  r307801 is related to r307800 however it was a separate commit to
  HEAD in order to maintain a separation between the functional change
  and a correction of style.

git-svn-id: svn://svn.freebsd.org/base/stable/10@308346 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f