Merge "remove vr/libeds" into oc-dev
am: db768fd8e5

Change-Id: I46f312ee39adb1239d1c97f676a730dad00bd10b