am bf281a9a: Merge change 9072 into donut

Merge commit 'bf281a9adef5a7ef342d0e5fb240d719575e5718'

* commit 'bf281a9adef5a7ef342d0e5fb240d719575e5718':
  Make changes to enable driver build in new location