Add android targets 18 and 19