Merge "update sdk/ link to studio/ am: 04de2d28 am: 2e28ebfc am:...

Merge "update sdk/ link to studio/ am: 04de2d28 am: 2e28ebfc am: 9de1d192 am: ec82d3e7 am: b0039181" into nyc-mr1-dev-plus-aosp
am: 69ead35a

* commit '69ead35a':

Change-Id: Ib37111287dff2b810464339c9ce5917fea0f1d32