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

* commit '1e619ab0117d9377fd58d15bbb569b3ef7c6a571':
  Move SDK platfrom component to rev 4

Change-Id: I54383236705a6ae773185bd9697ff0d760551ddf