Merge "DRM 1.1: Add VINTF doc" am: 8ad3e78d27
am: 2524404aae

Change-Id: I81688511156c89155eddfb6a537f6ceabd708afe