Updated bionic code to use libhybris