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

Change-Id: Ica1caebe6adf73ed5b299e3cbcef53c574f1c41e