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

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