OPTEE+AOSP on HiKey with SDP Support

For our project, we want to use the SDP feature of OPTEE on Hikey board. The normal world OS will be AOSP. I was following the instructions on: https://github.com/linaro-swg/optee_android_manifest/blob/hikey-n-4.9-master/README.md.
But I noticed that the SDP support for OPTEE was removed temporarily because of some ION Patch conflicts. #19

Is there any way we can use SDP on Hikey board? Using any version of OPTEE/ASOP/OPTEE /PATCHSETS?

Thanks

As replied on https://github.com/linaro-swg/optee_android_manifest/issues/23.