AOSP recovery for devices that cannot handle CSR

Change-Id: Ib4d4d1ffc8219a221417df82812ed4113fc30100