Incorporate libnetfilter_conntrack am: 8a44513648
am: 2f769d2bbc

Change-Id: I5ff32107d829f256e88fff7ee0fa6ede08d4e4ee