Merge "app: aboot: Change to update the boot and recovery partition names on L-MR1"