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

* commit '6551e70c34afc5ae799c3bb425d0683091f8f1ef':
  Move SDK platfrom component to rev 4

Change-Id: I1823c4b84f50f185bc524079f2d7132721b20164