am d81a6a02: Merge "Correctly label the fimg2d device node."

* commit 'd81a6a0237969052d7169711dc466766a4c633c6':
  Correctly label the fimg2d device node.