Merge "Fix link-type check warning in CtsErrorsApp" am: 2fcfbee05c am: 7112dcb3db
am: 8dc6d37664

Change-Id: Id6758c07750dfe036dd882354990f7e79f564374