Merge Team-Hydra/android_device/samsing_d710 into jb43