(Android) Change filename conventions again - don't append _android at
end