Fix for multiple merge problem.
Fix for multiple merge problem.

Change-Id: I5d9c497f44aa9cdc34c195c41e02c3d7353c3fb4

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