am c969a03b: merge from open-source master

* commit 'c969a03b5e5f6754adf45edd98ed1a10c42bf641':
  Fix device builds