Fix for AOKP

Change-Id: Ic18db22e818199c0785ff6ecab204c96af225d14
Merge branch 'ics' of github.com:FireDroid-montblanc/android_device_sony_montblanc-common into ics