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