Fixed patch conflict.

To resolve issue
https://github.com/aftersilence/android_device_huawei_hws7300u/issues/5