Merge "Add METADATA to proguard: GPL=RESTRICTED" am: 274b35be7c am: 57a78f1009

Change-Id: I9d207d31ba69c4c760815d3b5d77b6c9efcf81cf