Android: Fixing remaining errors in FlightActivity
CORE: Moving all the Waypoint timeout methods/variables to inside the