Merge changes from topic 'libvintf_cp' am: 9bd4c20764 am: 7fbbc2e85d
am: 31175a97b4  -s ours

Change-Id: I4dc312132d8c91e46de6fec7b944a8e42086577b