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

Change-Id: I6b96299e8480a7cdd64e6c3ca8ac1e3946971000