* Android build cleanup * Remove unnecessary workaround * Remove more unnecessities * Bump cmake version