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

* commit '0bd40f852ad223c813491e98dbe1e6fda9e4d790':

Change-Id: I973bc6a98c338eb8da978777ad0233de33bc3400