Android 7.0.0 release 21
Merge "Silence warnings for iputils."
am: 9259dfa16d

* commit '9259dfa16d5af036b02af3388c40579314056b25':
  Silence warnings for iputils.