Changed android support logic