[automerger skipped] graphics: composer@2.2 does not require mapper@2.1 am: 0eafa742c6 am: 7d49f30d3e am: 1dbb1b6530  -s ours
am: 1022ee1d28  -s ours

Change-Id: I0aff783523c379a00af280c924bedb3cfd9d86a3