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