Merge change Icb96cddc into eclair

* changes:
  Cleanup installed binaries before the NDK build begins.