fix build; undo automerger side affect
fix build; undo automerger side affect

Change-Id: I30da1c85dd67f62f94ddd436a9268eeaa717d7fc

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