Android S Preview 1
Merge "Add METADATA to proguard: GPL=RESTRICTED" am: 274b35be7c am: 57a78f1009 am: 191defa2ab am: 1d300f34a2

Change-Id: Ifcf214b0f970c1b1938856a6cc093371cd85ed68