am 36b3b873: merge from froyo-plus-aosp

Merge commit '36b3b873fdd85cbcd89b158f5e211cfa934f12a1'

* commit '36b3b873fdd85cbcd89b158f5e211cfa934f12a1':
  Fix for x86-atom/CALLABI.S to handle failure for android.jni.cts.JniStaticTest#test_returnChar. CALLABI.S was not returning unsigned shorts correctly.