Merge "android.os.VintfObject: add API for EDI." into oc-dev
am: 718688f39b

Change-Id: I937b7972b40747e36b9fe3a2ff008c1052652962