refresh from upstream
add includes from tilapia 4.2.2 JDQ39
Merge branch 'tilapia-4.2.2-JDQ39' of https://github.com/cxl000/libhybris into tilapia-4.2.2-JDQ39