Android R Beta 2
Merge "Add METADATA to ipsec-tools: BSD+Apache2=NOTICE" am: 1441a73cb3

Change-Id: I3ecc6e5cc69193c3612b623e2f312b403e951930