Merge "Fix link-type warning on CtsPermissionTestCases" into pi-dev