Merge "Workaround for libhoudini.so sin&cos bug" into lmp-dev