Fix centering in FrameLayout when margins are specified.
Fix centering in FrameLayout when margins are specified.

Change-Id: I022f458c73967eacc9487bf8d8119999395efda9

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