Merge "Merge "Move SDK platfrom component to rev 4" into nyc-dev am: 99433f6878 am: 95c74ecf9a" into nyc-mr1-dev-plus-aosp
am: 28e5cc9249

* commit '28e5cc924983b4efd28d3e97450fbaaf53c25a70':

Change-Id: I25b8818da298d6bdd585b6bd7897c041a76059fd