Fix the build (update API)
Fix the build (update API)

There was a last-minute renaming of some constants and update-api was
not re-run.

Change-Id: I3278cc204ea9e03ab3d5400cd308abedbf3b6da8

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