3.93 + xhdpi props cleaned up

Change-Id: Ia3d58e80d569f7dac23095d36477f0b4bac7ee65