Android R Beta 3
Merge "Add METADATA to nist-pkits: Apache2=NOTICE" am: 676706f8dc

Change-Id: I2a11d417f90f54db3274c684b8b0d193839f87c9