Merge change I31f23a0b into eclair

* changes:
  Remove build/platforms/android-*/common directories.