change frameworks/av and libhardware back to Omni