am 4b4129d3: am cc09e088: Merge change Icb96cddc into eclair

Merge commit '4b4129d30c75ab58f2ff9cb0696e894fde2b144b' into eclair-mr2-plus-aosp

* commit '4b4129d30c75ab58f2ff9cb0696e894fde2b144b':
  Cleanup installed binaries before the NDK build begins.