Merge "Clarify license terms for Romain Guy's artwork." am: a37de64bd6
am: fb5f7546b0

Change-Id: I964e6ca1dcc1bf15925d79a80e9707d8e691c4d8