Small fixes

Change-Id: I5ef57d2292e7698cef85a753e7066cf62295d95d
Merge branch 'Testing' of git://github.com/wulsic/android_device_samsung_nevispcm11 into Testing