Android R Beta 2
Merge "Add METADATA to scrypt: Apache2+BSD=NOTICE" am: c284f76b4f

Change-Id: I92ac92c311688efe9185a523d8b6425161396d75