Merge change I5a66bbdf into eclair

* changes:
  Rename the layout device from ION to ADP2.