Android compilation fixes