Merge "Log errors on android.os.VintfObject.verify()" am: 54b1e9c57c
am: 90a5fd0549

Change-Id: I241c75ad6dbf4a5a450b6b1a0e1f8e65d57c4632