am 3a92963b: Merge change 22652 into donut

Merge commit '3a92963bf3865330e89b3e7a66b66dd9cfc8792b' into eclair

* commit '3a92963bf3865330e89b3e7a66b66dd9cfc8792b':
  Cleanup SDK packaging: remove alias build files.