Some fixes

Change-Id: I3bc8a3271b2e944636438d081bdd3348f53f060c
Merge branch 'armv6-4.4' of https://github.com/MerkMod/android_frameworks_base into armv6-4.4