Merge "qcacmn: Fix build errors generated by gcc 6"