Merge "Merge "Clarify license terms for Romain Guy's artwork." am: 9f56d51018 am: 95736c9fb6 am: 36daa700a0" into qt-r1-dev-plus-aosp