am fab87998: (-s ours) Fix the platform version (1.6 now) and sdk version (4)

Merge commit 'fab87998b50c997ba4e506a080d01f606615eb19'

* commit 'fab87998b50c997ba4e506a080d01f606615eb19':
  Fix the platform version (1.6 now) and sdk version (4)