Android R Beta 3
Merge "Add METADATA to iputils: GPL=RESTRICTED" am: 9345797422

Change-Id: I1c13e4fadd3eb109a9c3c8cd9b00ce0f5c9657a6