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