Merge "Remove target_sdk_version parameter" into nyc-dev am: 07f46c84e6
am: 10743a9db6

* commit '10743a9db69c895a64e60eed86c226a9968ab0b2':

Change-Id: I34153ada3479d2960bce70362bfb7fef14f21922