SystemUI: Fix dock battery icons for phablet UI

For mdpi devices, the dock battery icon in the status bar is too large and do
not match the size of the stock battery icon:
http://img835.imageshack.us/img835/8207/screenshot2013020910320.png

This fix will have the battery dock icons resized to the right size:
http://img546.imageshack.us/img546/8302/screenshot2013020910233.png

Change-Id: Ic6ec875f4ebe29b33edf6cba6997db0ea1b70aeb
fixed inconsistant define values with android_nfc.h

Change-Id: Idccd2de60caf7b72839d158b39d14e2cfcdd5fc7
Framework: AOSP Fix - starting window memory leak

If starting window is added to arrays like mViews in
WindowManagerImpl.java, but not accepted by WindowManagerService,
we leak starting windows. To avoid leaking, remove the view
from WindowManager.

Change-Id: I4d98b883e9dfaf5e71bdece385643ba1b59b2633
Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_frameworks_base into cm-10.1