Merge Omnirom into AOSCP