Redo previous commit to not break android builds.