Update to libhybris upstream git master
Merge branch 'master' into qcom