Merge "Merge "Log errors on android.os.VintfObject.verify()" am: 54b1e9c57c am: 90a5fd0549 am: 429b739ff5" into oc-dr1-dev-plus-aosp
am: 60d9fd87f7

Change-Id: I8892c182ae72bb1b5928eaece2a7cf15a7c33f74