android compile fixes