Merge pull request #1 from percy-g2/patch-1

fix for bootloop test
Merge branch 'cm-10.1' of git://github.com/CyanCom/android_device_sony_taoshan into cm-10.1