Merge change I26a21669 into eclair

* changes:
  Set SDK Platform/Doc to API 5.