am a224c03a: am 36b3b873: merge from froyo-plus-aosp

Merge commit 'a224c03a19423e9b2827dddd53fde5535da7b8ef' into dalvik-dev

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