Merge "Move SDK platfrom component to rev 4" into nyc-dev am: 99433f6878
am: 95c74ecf9a

* commit '95c74ecf9a3776ba30a1e913bc51b59dcdf8e6e9':
  Move SDK platfrom component to rev 4

Change-Id: Ib45f7e6a4a76a23486e6ad954d20f8418889d694