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

Change-Id: I915908e4623bd098f6545227c23f883c4bed4ae1