Merge "Add android.os.VintfRuntimeInfo" am: 4f8a375958
am: e0bf06dd9e

Change-Id: Iae968194f2dbaa2effcf19399b1165a233aa32ba