am 1ff4f596: Merge change 8502 into donut

Merge commit '1ff4f596bfe608b26656f1e854f1a5504877bdaa'

* commit '1ff4f596bfe608b26656f1e854f1a5504877bdaa':
  Rename ndk/build/platforms/android-1.5 into android-3 to match API levels