am bae43244: am d8aa2895: Merge "SDK: fix sdk_repo build."

* commit 'bae4324402ec0acc594a16af225f23dd76b28400':
  SDK: fix sdk_repo build.