Merge branch 'cm-10.2' of https://github.com/CM10DNA/android_device_htc_...

...dlx into jb-mr2_mkt