Merge "Remove sin/cos workaround for libhoudini" into lmp-mr1-dev