zach-klippenstein Merge pull request #41 from dbriggsDFleet/androidx