Merge "Clearly indicate vendor errors from keymaster in logcat"