Fix handling of AOSP recovery commands