some more fixes of buld (from merge of kitkat 4.4.3)