Merge changes I27b7e463,Ie9ab9b76

* changes:
  Enable algorithm net tests for 3.18 kernels
  Fix algorithm tests to ensure no lingering sockets
tree: 6033786ef19eba07ec1b65ccc60ff86403832602
  1. devicetree/
  2. net/
  3. Android.bp