Update API.
Update API.

Not sure the changes were correctly rebased last time.

Change-Id: If6ab4014f312bef240df60f0b1cd6d923f472836

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