am 947561b3: am c124b2ab: Merge change Ib1b01007 into eclair

Merge commit '947561b337e35d7645f4efdb238fbc6f8281b3d5'

* commit '947561b337e35d7645f4efdb238fbc6f8281b3d5':
  Parse add-on supplied layout devices.