am d9050e61: Merge change Idc9b152e into eclair

Merge commit 'd9050e6102fb37c8f5df02dbfd17cac728b9f0e4' into eclair-mr2

* commit 'd9050e6102fb37c8f5df02dbfd17cac728b9f0e4':
  Add layoutopt to the SDK.