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

Change-Id: I40417f20296afd35c237036aea4912b63c17d8d6