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

Change-Id: I2266994567f5533124566cb0ea41d792bb8e2e72