Merge "Add METADATA to skia: contains GPL=RESTRICTED" am: 55ce1d5087

Change-Id: I549c2b3b281ff43f6eaf987228adb1e6e81e2236