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