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

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