Adding More Doctor Checks for Android and Dev