If cidr is specified as part of src or dst address, use it for acl

Change-Id: I2af6cbd7a599e36a54eaad774ea05e9043e308d6
Closes-Bug: 1365427
Merge "If cidr is specified as part of src or dst address, use it for acl"