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

* commit '99433f687836b98aaf411478c728bd8c4a2c8e32':
  Move SDK platfrom component to rev 4

Change-Id: I18d76092d4e19322d9a5e05a7ff628a167dff109