am e9555599: am 087ccb01: Merge "Fix SDK repo to prevent mixing different targets."

* commit 'e9555599da16c3e40d0d359f6e46fedfc1f03b1d':
  Fix SDK repo to prevent mixing different targets.