Merge "Add android.os.VintfRuntimeInfo" into oc-dev