[automerger skipped] graphics: composer@2.2 does not require mapper@2.1 am: 0eafa742c6 am: 5ef198aa6e
am: 972f8d4dc9  -s ours

Change-Id: I05ba65dcc10e0a1c48d5ceab2137ad60ebd417dc