Merge omnirom into AOSCP