Adding Android recovery support