Update 5.xml with last minute changes.
Update 5.xml with last minute changes.

Change-Id: I520ca879d31cb4581556138a73b542c070de3c00

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