Merge changes from topic 'libvintf' am: c1ca21a32d am: beb1cb1df5 am: 35849591a0  -s ours
am: 87206b3ca2

Change-Id: I486a89ed3c2a9f778fa25cfa13d413718363f488