Merge change Idc9b152e into eclair

* changes:
  Add layoutopt to the SDK.