am 71ad7c8f: (-s ours) Fix SDK repo to prevent mixing different targets. DO NOT MERGE.

* commit '71ad7c8f4ea7278f48e276c2f232c674b20f7384':
  Fix SDK repo to prevent mixing different targets. DO NOT MERGE.