Merge "identity: Make NoS libeic and AOSP libeic align"