am cc5809bf: Merge "ndk: Use __ANDROID__ instead of ANDROID." into gingerbread

* commit 'cc5809bf2fdae2ea7b5d84b21875cd2220c66105':
  ndk: Use __ANDROID__ instead of ANDROID.