Incorporate libnetfilter_conntrack am: 8a44513648 am: 2f769d2bbc
am: c4f2bc1fec

Change-Id: Ief4a6dce349c74f8a63e1565188680e39e56b953