Fixes so that one branch builds on both android + linux.