Merge change 8502 into donut

* changes:
  Rename ndk/build/platforms/android-1.5 into android-3 to match API levels