Merge "Remove wifilogd from hikey .mk"