am 5f9e0abe: Merge change I5a66bbdf into eclair

Merge commit '5f9e0abed17ab1197a0868729232cb2c2024cef2' into eclair-mr2

* commit '5f9e0abed17ab1197a0868729232cb2c2024cef2':
  Rename the layout device from ION to ADP2.