Fix broken build. (do not merge)
Fix broken build. (do not merge)

I -did- run it...  why did this later break on me?!?

This is integrated from the Eclair branch.

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base