Merge "Fix testIPv[46]Remarking on 5.0+ kernels." am: b93f0dbebb am: ca78b428ee

Change-Id: I17d7a342c753b33c52b1131d57ae371c0fddfe18
tree: a57badf166501a6d33b661e3d5b3bf90dee97df3
  1. devicetree/
  2. net/
  3. Android.bp