yuga: reorganize and cleanup

Change-Id: Ie76952eb78446de283d46e7c90ed86b13d102fd5
Merge branch 'cm-10.1' of cmg:CyanogenMod/android_device_sony_yuga into jb-mr1