Merge "Add METADATA to iputils: GPL=RESTRICTED" am: 9345797422 am: d5f5073532 am: 8fc24f1baa am: c479c0737d am: 351ff485c5

Change-Id: I26edb25bae83b6bc8f4f7b7a547be8a7e479c4f3