am cc09e088: Merge change Icb96cddc into eclair

Merge commit 'cc09e088d869453536a1e9d761bd92df1a19fe62' into eclair-mr2

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