remove unnecessary patches and enable mariadb for arm and i686 (#1115)