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

Change-Id: Ia1c27da2d90f6a577001d72174ecea1d3d259b13