Merge "aboot: Load target keystore during recovery"