fix issues in current.xml (bad merge earlier)
fix issues in current.xml (bad merge earlier)

Change-Id: I9be4dbe04c126db7fc92f116aa73bba6c96042cf

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