am 02fe35d6: am c969a03b: merge from open-source master

* commit '02fe35d64f2eb11b6ce8afd046a4d37ee227d1a9':
  Fix device builds